From ffeb954aff59905b1f8956b9a73a2e968711a573 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 4 Aug 2008 23:51:16 +0000 Subject: [PATCH] Cast tile, stipple and clip_mask pointers to gintptr when calculating 2008-08-05 Tor Lillqvist * gtk/gtkgc.c: Cast tile, stipple and clip_mask pointers to gintptr when calculating hash, so we get all of the pointer bits on Win64 where long is 32 bits. svn path=/trunk/; revision=21002 --- ChangeLog | 6 ++++++ gtk/gtkgc.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50f285b6c5..ecacd648a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-05 Tor Lillqvist + + * gtk/gtkgc.c: Cast tile, stipple and clip_mask pointers to + gintptr when calculating hash, so we get all of the pointer bits + on Win64 where long is 32 bits. + 2008-08-05 Tor Lillqvist * gtk/gtkprintoperation-win32.c: Don't need to declare diff --git a/gtk/gtkgc.c b/gtk/gtkgc.c index 8e6bc9f8d5..15d863621f 100644 --- a/gtk/gtkgc.c +++ b/gtk/gtkgc.c @@ -222,15 +222,15 @@ gtk_gc_key_hash (gpointer key) } if (keyval->mask & GDK_GC_TILE) { - hash_val += (glong) keyval->values.tile; + hash_val += (gintptr) keyval->values.tile; } if (keyval->mask & GDK_GC_STIPPLE) { - hash_val += (glong) keyval->values.stipple; + hash_val += (gintptr) keyval->values.stipple; } if (keyval->mask & GDK_GC_CLIP_MASK) { - hash_val += (glong) keyval->values.clip_mask; + hash_val += (gintptr) keyval->values.clip_mask; } if (keyval->mask & GDK_GC_SUBWINDOW) { -- 2.30.2